bitkeeper revision 1.1389.5.10 (4278d6c2PICykk7zJw1Q6ijXxta3Dw)

Fix link order.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/pci/Makefile b/linux-2.6.11-xen-sparse/arch/xen/i386/pci/Makefile
index a606c3335b32f336afa868d82929435e7a366ed8..76c024abfd9db68892d8b175eada9be2d8119e3a 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/pci/Makefile
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/pci/Makefile
@@ -11,7 +11,8 @@ c-obj-$(CONFIG_PCI_DIRECT)    += direct.o
 c-pci-y                                := fixup.o
 c-pci-$(CONFIG_ACPI_PCI)       += acpi.o
 c-pci-y                                += legacy.o
-pci-y                          += irq.o
+# Make sure irq.o gets linked in after legacy.o
+l-pci-y                                += irq.o
 
 c-pci-$(CONFIG_X86_VISWS)      := visws.o fixup.o
 pci-$(CONFIG_X86_VISWS)                :=
@@ -26,6 +27,6 @@ c-link        :=
 $(patsubst %.o,$(obj)/%.c,$(c-obj-y) $(c-link)):
        @ln -fsn $(srctree)/arch/i386/pci/$(notdir $@) $@
 
-obj-y  += $(c-obj-y)
+obj-y  += $(c-obj-y) $(l-pci-y)
 
 clean-files += $(patsubst %.o,%.c,$(c-obj-y) $(c-obj-) $(c-link))